Thanks, this looks good to me, please submit a smaller diff :p

Diff reduced! (But you should totally consider removing trailing whitespace some time in the future 😬 !)

I like to have my leading white space at the same indentation level as the rest of the code, it just looks tidier to me. Otherwise you need an editor capable of recognising the indentation level and automatically inserting it. Trailing whitespace on the other hand normally should be removed, except when it's sometime structural (e.g. in the license text).